debug error when merge conflit