Fixed merging issues.. some random text was in there