Tips to effectively handle and resolve conflicts #12