resolving merging problems - V0.1 !