some merge mistakes - fixed