first, cleaning up my mess
fixing merge issue