minor changes due to conflicting merge