3 tips to resolving a conflict