minor changes
merging
premerge commit
merged conflicts
Changes for the alpha version