Removing random log
Merge conflict