Merge "Fix RepositoryState.MERGING"