Some weird merge conflict
Accidentally a method
Formatting