removed git merge leftover