Git Merge Master Into Feature