merging problems fixed