adding in comment so you can see whats going on
fixing stupid merge issues