fixed #21
fixed #22
conflict resolution