resolve conflicts in TestMillPipeNewEdit and TestSaveRailcar