updated git-log file
fixed merge conflict