How to deal with CONFLICT

248