updating on GitHub & locally to simulate conflict