remove unused import (merge confilct)