fixed pagination
merge resoved
updated irnore file