add files resolve conflict