fixed build errors after merge conflict