ask if want to merge
bug fixed