fixed changedtask, added remote file merge