How to deal with CONFLICT

472