Zoom (not working).
Resolve conflicts.