all files
removed conflict
fixed conflict
added code