No one likes conflict - and conflict in the workplace can be even more challenging. Use these 6 tips to deal with conflict at work and resolve issues.