removed errors
resolved conflict