fix when merging