check conflict

remove conflict