Somehow commits didn't merge into the branch, fixed now