correct all bugs after merging