flip quote
merge with master