merge peer and master