instead merge master into your branch
# knote
n
instead merge master into your branch