Fixing merge errors, again