removed some error after merge