merge confict typo