fixed stuff with merges