reconciled prior GitHub commit with separate working file