fix first merge conflict