Conclusion
Correction merge conflict