Shorten bio
Fix typo fulltime
Resolve merge conflict