adding database conflicts