Resyncing after commit merge