no log message in typical merge.  THIS IS NOT RECOMMENDED
removed cat command to keep fancy branch colors