awareness
fixed merging issues