fixed merge conflict locations index
more styling
styling and fixed edit path