more merge conflicts
fixed conflicts with Gdiff