Fixing the stupid merge bug