fixed an error due to a deleted method
Fixed merge errors