Merging conflict was not fixed (logback file)