Fix bash prompt after merge