[ADD] rebuild
merge conflict