removing duplication from bad merge