some new files
resolve conflict
new makefile