Handling conflict

bri201316