Logging pull conflicts in red