added includes for customer and purchaseitem
fixed merge conflit