correcting unfixed merge conflicts