Fix merge conflict
Fix merge conflict

dgdosen/Quick,DanielAsher/Quick,Quick/Quick,phatblat/Quick,dgdosen/Quick,Quick/Quick,jeffh/Quick,jeffh/Quick,phatblat/Quick,Quick/Quick,jeffh/Quick,DanielAsher/Quick,dgdosen/Quick,phatblat/Quick,Quick/Quick,phatblat/Quick