Fix merge-induced error