Initial commit
fixing conflicts