resolving conflicts for customer controller