Modified index and base file design
Corrected conflict