Stock Page Top Users
conflicts resolved