Resolved warnings
Resolved merge conflicts
Resolved merge issues
Fixed crash issues