Rename to resolve-trivial-conflicts