Cleaned up merge results