added master console.log
sorted conflict