Integrate master into no_force