fixing errors after merge