Fixed merge bug which froze head.