recommiting merge issues
fixed merging issues with incident