Merge and FIX Conflicts