merge fixed
merge conflict
add some stuff