Improve merge status
Identify merge conflicts for status