fix issue resulting from merge (possibly)