solving a problem that came out during merging.