Use a manifest
Resolve conflicts