Trying to pull
Fixed merge conflict