Fixed previous merge problem. I ommitted a line unfortunately. Then, I removed the line to call tidy because it was breaking everything.