Created a line to cause a merge conflict in rewriting-the-future