commit w conflict