first big push
resolve conflict