made remote to mikes updated simple github and pulled, now fixing merge conflicts