Reorganizes the branch according to updated master.