fixed interactive object bugs
resolved merge conflict