Reverting some conflicts in the merged files