simplify all
resolve conflict