add activated state to button
fix conflicts