Fixed weird merge.