What is the best way to make the development in parallel, so that features can be easily included both in the Fremantle and Diablo versions?...