Also, when a file has a ~ on the end, does that mean I need to override or merge that file? I didn't remove the ~ 's from the files.