timer
fix conflicts