added inmerge and other shell files