cleanup from merge-conflict