git merge

https://ift.tt/32MmFVJ