fixed merge issues with drop panel on user_home