remove merge leftover