fixed more merge conflicts