Added defs
More comments
add if-then-else
resolving merges
removed comments