fixes for merge conflicts