topics conflict solved
merge solved login ,register,comment topics done