merging issues
merge crap