...
fixed merge issue
started working on gaussian blur