merge + modif BuildPath