How to deal with CONFLICT

280