fixed little error in merge conflict