fixes for merge issues