How to deal with CONFLICT

133