house furnitures
same commit after conflicts