manual reconciliation

I think if you just remove the last enter line, and then commit, the diff towards master will see that there is no change between the two files ;)