Reparing repository
Fixed the merges