Delete git conflict text code