Odd that this didn't give me a conflict when I merged, just took mine. This must be why re-basing first is best practice?