no changes, git just thinks so
resolving conflicts