Try to commit a conflict file
sdfsdf