fixed the f**king merge