fixing merge issues, not sure what's going on