add missing part of merge