fixes for merge