Merge "Prepare EGit for the new State MERGING_RESOLVED"