Fixed weird merge error.