combining code
merge errors suck