add files
add files resolve conflict