Clean up MergeException

Change-Id: I961e5a11cb9f75fbc4905da5c6f956ec968cde2d
1 file changed