Fixing merge imports