Fixing merge conflicts and library dependencise
Update readme