First Pelican commit
Fixed merge issue