fix problem with police button
fix conflict