Fixes rebase mess