Fixed merge conflict again