Fix master branch

as the title says
branch_merge_succesfull

first_attempt_at_merge_succesfull?