Fixed merges and ogranized imports