Fixing Merge issues (again...)