Support a merge with conflicting gitlink change