i've committed product controller
resolve the conflict
I've pushed Faculty