Selectively merge Quotation from allthesignals
Resolved conflict