Revert "Fixed conflicts on merge."

This reverts commit df165b98e5884c9e0412c920e6174872a23155b3, reversing
changes made to 5184d256da9022eee1c5c6adbb59cd45fd332733.
Trying something new
Just a check before starting to work

Just a check before starting to work.