fixing more merge conflicts and removing errors