fixed rebase conflicts