Fixed merge branch damage.