Adding CTO
Resolving conflicts