The most recent merged branch caused a merge conflict. name_obj is no longer used.