Fix merge leftover