made mistakes while merging