display issues; event prevention
resolved conflict
mergeconflict