Fix when merging