add harsh merge