GitHub-Problem local remerge with kappr3