click display area
merging conflicts