removed unused import, console.log
fixed merge