fixing conflicts

@adamggg