changes overwritten by bad merge