Merging changes and resolving conflicts