Cleaned up mess after git merge fail.