conference date format
fix tests and fix feed item source url for atom feeds with local links
fix merge conflicts