changes to philip mergetool test
solve merge problem