added third conflict
added third merge conflict