fix - remove merge conflict comment