fixes for merge problems