finishing touches
merging conflicts