conflicts saass fix