Fixing merge problems (again)