started working on PULL
finish DIFF, fix LEAVE
merge