Fix the lein profile merge conflict.