replaced files with nesta demo
fixed merge conflicts