merge with pelican alignment