profiles that doesn't conflict with master?

I dunno what's up, but the most recent commit on profiles, 5ae82b125a, was a conflict-free merge from tux3:master