removed merge conflicts in files