Remove Git merge leftovers from SQL diff