What is the main conflict in The Catbird Seat by James Thurber?

The story chronicles a battle of wills between the fussy Erwin Martin, head of a filing department, and Ulgine Barrows, the firm's efficiency expert who threatens to bring change into Martin's wellordered existence.