Merge fail; lost header edits from remote.