made some more references
merged a conflict