ok guys let me resolve this conflict