remove ms
fixing merging file