fix final merge conflict