alignment ofo conflicts before merge