fix org list merge issues