solutions for conflicts ...