topic view fix
account page update
my merge problem is resolved

my merge problem is resolved