Don't start merging if there are uncommitted changes

Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3