then depending on how much our code diverged or co...
# knote
n
then depending on how much our code diverged or conflicts it will need some merging, gitkrakens merge tool is good enough though