first commit
fixing conflicts