merge Patrick