repaired fail-merge