Removed Merge Conflicts from the pull from master. This branch should be good to merge into master