In progress merge and updating import file