fixes rebase conflicts