Revised merge conflicts.