fixed merge bugs + examples