added watch and live reload to dev desktop task
fixed merge conflicts