Fixes merge leftover