Resolve merge conflict on aboutme.css