+ activites(addfile)
+conflict
+ admincontroller
bloup