[scripts] Updated finishfix to pull from origin before attempting merge step.