merging  fix