fixed constructor merge conflict