placeholder and furniture builder edit
Fixing conflicts