Cleaned up merge conflicts from last night