changed version
version change
version change
simplifed merge process