Removing out of date guideline.
resolving conflicts