Corrections after-merge