Teaching Ryan about git conflicts