Commit conflict test
without mesg