made some tasquid specific content changes
fixed conflict