on the fly changes
merging
more merge fixes