add FileEntry and ICB Tag
resolv conflict