house animation edit
untrack/ignore
merge