Fixed merge conflict function