style and index
conflict fixes