remains of a Git merge?