correcting stm merge issue