Initial commit
Fixed merge problems