index changed
conflicts resolved