Corrected errors caused during merge-conflict resolution