stupid merge bug