index conflicts resolved