Fix Rewsly merge problem.