Fix custom style and rename lost in rebase