How to deal with CONFLICT

134