trying to fix a merge bug