Fixes for merge conflicts