joemasilotti Fix merge conflicts