Start on simple resolving. We don't try to fix conflicts yet to keep things simple, so for now that's up to the user.