Creating my first conflcit (from GitHub)