Filled resume
Resolve Conflicts