big bang
fixing conflicts