pdf interface changes
resolve conflicts