I think i might have managed to merge the commits.