finish merge conflict fix for Max's profiles table etc.