how about we don't commit conflict markers?