debugging for demo
fixed merge conflict