solving conflict, whereever this one came from