fix merge
remove manifest files