getting ready to merge
merging
merging conflicts fixed, initial markers added