update zoom button
fix conflicts;