Attempted to merge some things