removed merge conflicts