removed some old conflict code. woops.
make sure that ES builds unstable branch
exynos package now uses the new style

use the $md_build variable