clean
isRest method
fix conflict merge blueprints
if isRest