Initial commit
Removed conflicts