normalize ShopList.java
resolve conflict