Fix commit with rebase shit