closes issue #1
MERGECONFLICT (fixed)