Fixes

Fixing merge conflict...