fix not merging