Add all files
Resolved conflicts