small change for merge issues