merging problems and other stuff