Add my name
Correct conflicts