fixed errors from merging