Add conflict resolver