theorem 1 done
merge conflicts resolved