fix
resolve conflict
votes
add reset