fix old merge conflict