Fix merge leftovers