changing zoom levels
fixing merge conflicts