Fix some failed merges.