https://medium.com/@siddhantchalke20/how-to-resolve-merge-conflicts-a-beginners-guide-to-github-aabe9cdcd88c
