Split the last line
Revert "Split the last line"

This reverts commit e8e7a86b2cd2aa6d821749076aa551b0e961c2f3.
Fixed security hole
Start developing a new feature
Start developing a feature
Fix something from the previous commit
Fix security hole
Fixed file conflict