Fixing merge issues again