Fix components relative path
merge remote