New sales added, some tests
Again resolved conflicts