Restarted server after deploying.
Fixed conflicts