remove old version
merge
merge
new version
fix conflits
remove old files
remove files
fix