@codingricky You can solve this problem with `git rebase master`.