Remove useless else...return
Fix conflict
Extract method for if check.
merging and fixing conflicts.