fixed crazy merge errors - I hope