minor changes to fix merge conflict

Do you need console.log here?