A compromise is made between the officers to ensure that the conflict does not affect the workplace moving forward