add config
temp
fix merge conflit
message count update working