Fixed delayed terminating and enlarging lags
solving conflict, added gitignore