How to deal with CONFLICT

473