fixed silly syntax errors
asdfasdf
asdf some changes and shitz
fixed conflict
merge merge