For merging
Merged conflict files