solutions in master from now on