Fixed weird merge error