fix bug merging