Fixed a small error that occurred because I had merge problems