p79
solve conflicts