Impossible To Solve Conflicts For Mac fotynell