Short hand for nil checks (trying to improve the codez)
Remove uneeded statement.
Fix conflicts.