removed unfixed merge conflicts