add 3rd-party
resolve conflict