removed merge artifacting
removed merge artifacting