Commit and push everything before a conflicting commit

Change-Id: Ifdc45e2b0f540ac8212aaca835b9d11c18078eb5