commit conflicting files