added customer count
added customer count
fixed merge conflicts