ignore logs for less merge conflicts