Final Merge. All Files added