- intermediate merge between master and branch