Remove useless else...return
merging and fixing conflicts.