merge error - missing import