add assebly/executable files
Resove conflicts