Clean tabs & format after the GIT merge disaster