master rebuild and "rebasing"