fixing rebase conflicts