prepare for force merge