after merge and deletion of .orig files