resolved some merging problems