Make a conflicting commit