remove lock file
sync from downstream
add helper scripts
remove patch application that is not needed