merge fix
working on conditional blocks