fix merge errors and stuff