final changes

fixed merging problems