Formatted the shit out of the log file
merge