Tag: handle conflicts