Resolve conflict for AddNewInstitution.php