fixed a weird merge issue