Easier solution, with proper protection and configure warnings.
merge-mark