fixed weird merge error