fixing more merge conflicts