correction after merge