Merge with slimroms