conflict still running
merge conflict