add email and stuff to model
remove target files
merge conflict resolution