Resync

Merge directions fixes