Merge "Added MERGING_RESOLVED repository state"