import fixed
merge additions deleted