Pretty logs.
merge conflicts cleared