Allmerged

resolved some merge conflicts