Fixed merge conflict #2