fixed timer
fixed merge conflicts