oops forgot about glm
merging conflict