Model conflict fix for LFS