Added files
Resolved conflicts