fixing a few merge things