Database first version
merged conflicts