Bad Stuff Happened

James made me create merge errors. It was not my fault.
Conflict Fixes