Trying to merge shit