Master c3
resolve conflict