Finished
Merge conflicts resolved
Files added