bad merge with version conflict