Getting closer
Fixed the conflicts