Not sure what happened but there must of been a change in master that wasn't in the branch that was merged.