fixed sender, changed db
fixed conflict