try to fix bugs
Fixed merge issues