Here are some tips on how to resolve conflict without using the baseball bat method.  There can be a peaceful resolution.