Merge bug  fixed