Adding general conflict resolution page