[#2030] Fix merge_init when checking merge conflicts.
Merge master.