my lab version
resolve conflict
can solve 6 problems now...