Added new files
Resolved conflicts