Resolve conflict and start nrepl server by default