kill the MERGE!!!

merge went bai bai