Amar Jawan Jyoti to merge with National War Memorial flame