lindsey said she merged it correctly :/