Add Character model & Form
Fix merging