added close to conflict window