Timer fix and user can only answer once
Timer fix and user can only answer once
Fixed conflicts