Fix Merge Error parts