merge check
 chnaged