added gitmerge files to new folder