Update README.md & resolved conflicts in Log.js