Initial commit
Fixed merge issues