Added merge conflict exit