* fix merging