double checking to see if i fixed weird merge issues