working version, added skeleton for conflict merging