Fix duplicate line from the merge conflict