master collaboration 1
clear all conflicts