Added two of the three log files
Fixed merge conflict