Aftermerge restoration commit