update 1.1
hello
fix conflicts