Bad commit
Fixed merge errors