fix for merge issues