fixes for merge
fixed init stages after merge