Fix launchpad conflicts