everyone now on same master and working