program adaptation preprocessing done
program adaptation bug clean
fix merger conflicts