conflict resolution

Connect with 'SheSaid'