Showing merge conflict