correct bugs from merging