Resolved pop conflict