So you fixed a conflict somewhere in your repo, then later stumbled on exactly the same one… Enter 'rerere', which stands for Reuse Recorded Resolution.
R. Muhammed. volume 2 of 3, 1133 Broadway,Suite 706,New York,NY10010,USA, Institute of Doctors Engineers and scientist(IDES), The Association of Copmuter Electronics and Electrical Engineers, (July 2011)
O. Laadan, J. Nieh, and N. Viennot. Proceedings of the 41st ACM technical symposium on Computer science education, page 480--484. New York, NY, ACM, (2010)