Added some new levels
fixed conflict
Fixed conflict