Initial commit
Fixed merge issues with initial commit