add files
resolve conflict