refixing merge conflicts