Remerged rules into scala-abide