Merge conflict files only 31