Thanks, merging!
Very important for the future, do not do code formatting in the same commit that changes the behaviour or adds new code, because it is harder to spot what are the actual changes. Code formatting is more than welcome, but has to be done in separate commits.