Forgot Password error fixed

Conflicts removed and fixed.