Fixed small merge leftover