Update _config.yml

Add myself to the members list as joining formality.
Fix merge conflict