add pending changes
merge inter
stuff