commit 1
add my name
fix conflict