Confict b/w gs and gst resolved