resolve persitence conflict due to last merge