Removed error typedef and defaultinput typedef
Merged conflict