timer working finally
fix conflicts