merge with rosdash by hand