reconciling conflict
update project docs