Final version
resolve conflict