Fixed some more merg stuff
Not sure whats going on here
asdf