Fixing merging for main