How to avoid WhatsApp locking up my contacts
Go to Settings > Accounts > Whatsapp > My Whatsapp Account
Remove the account
Make any necessary contact changes
Open up Whatsapp
At this point, Whatsapp should re-associate your contacts with the existing users.