Repaired merge