rebuild app with mace and new onion
merge files