Revert 6b04cc6..03a64a1

This rolls back to commit 6b04cc626f20e4ff65e5d571c948dc472ac1188d.
Revert 05e49d9..454ebd5

This rolls back to commit 05e49d9976f9730b272fab569557df8a1ea4f658.
Revert "test conflict 3"

This reverts commit 03a64a14b8b29b905ffe1296fa033e0ff320741e.