Handle old commits that have been merged manually