Merge conflict - remove userzoom