Removed conflict line that was left from last merge
Removing from the master branch code that should only appear in the asp/asap branch