Refix Merge Issues