practicing conflicts and merging