removing prints
fixing merge
changing disparity function