Corrected merge from local imports