some merge conflicts fixed