fix bugs from merging