merge conflict should be fixed