merge conflict
removing conflict
new results