doing work
Fixed merge errors