Fixing incomplete merge