change conflict in TaskCard