setting up
screwing with index
fixed personal merge errors