Fix Conflict error