housekeeping
merge script (WIP)