Analysis: cleaned up merge