added missing names
fixed names and removed mine/theirs after conflict resolution