rename emoji to emoji-me
fix conflicts