test conflict with egit