Attempted to fix line merging