testing edit of dev file twice to merge