one more stupid merge bug