New file
Removed conflicts