Remove unreachable return statement
Updated changes.txt
Merge conflict in changes.txt file