cleaned up code
I hope this fixed the merge
merges suck. a lot. really