src/bin src/edje_external conflict fixed