Could be. If you CTRL-SHIFT-F in Eclipse (as long as you imported the formatting rules) it should fix it. It won't stop you merging anyway though, will it?