Undoing mess from Git conflict.