merged first branch back to the master