Resolved Conflicts with Staging