rebase conflicts
add additional files