errrr oops...
fixed weird thing with git
 fixed merge conflict from previous wtf