add line from branch_on
add line from master
resolve conflict
rename directory
remove old files
rename again