fix merge leftover