Fixed merge conflict bug