repo setup
fixing conflicts