Fixed Merge issues

Everything’s working now