made the merge changes