6 Tips to Resolve Conflict Now