Add my name
Resolved conflicts