resolved dos merge cs