fixed "no conflicts" field