add missing files and select proper drill option in DRILL selection box
add missing files and select proper drill option in DRILL selection box
resolve conflicts