Merge conflict

avoided a hassle of merge conflicts by pulling down remote changes to local repo first, then created a new branch to push up for pull request, now I have the green light to merge on here