Base files
Solving comflicts