Merge Fix 2

All merge changes fixed!