Fix contributor list; break about me section
Clear up merge conflict