add romain files to makefile, and try merging