merge peercoinarmory