resolve merge leftover