Remove merge :(