Govt vs Opposition faceoff on Amar Jawan Jyoti flame being merged