Revert "fixes merge conflicts and formats files"

This reverts commit d22265995fd431eb3980c34c5d631ffd4b20bfff, reversing
changes made to 7df4c12b59d51a703a7853b2dfac59a93c464503.
Revert 6e6a38d..7658fc9

This rolls back to commit 6e6a38d21d1153d3fc9d227576460d272e438a92.
Revert 7df4c12..ea93e43

This rolls back to commit 7df4c12b59d51a703a7853b2dfac59a93c464503.