merging with conflicts and latest stuff