updated extraction log
resovled merge conflict