Fixed Seg fault
Fixed Conflicts