Merge "Remove conflicting packages in Ubuntu"