merge rsser
fix