Added log.m
Merge conflict