mariusl - fixing conflicts