add conflict hopefully
add final version after conflict