Fixing silly merge errors