Fix Merge Issues

Hopefully fixing merge issues.