Merge to avoid inconsistencies