fixing merge bug, fuck git