Added conflict management to index