final merge conflict should be fixed