implemented multiple implementations support
fixed conflicts and now merging