merging problems :(