master_a modify
master_b modify
resolve conflic
delete favicon