Fix bu
Initial mofificaitons for merge functionalitywq