fixed int declaration
merged