initial commit
added mergemall
ask if want to merge
bug fixed