Make Characters
Resolve conflict