Merge conflict resolved.
Added styles.