Resolved type conflicts with ER change.