Fixing silly merge