build
add demo
resolve conflicts