admin side fix for company edit
resolve conflict