Remove merge leftover