revert previous dirty merge and now do semi dirty merge. reconcile later