commits id say
Fixed many merge errors