Conflict merge, began fixing z-axis