Merged conflicts