Revert "commit after conflict"

This reverts commit 444ca7d13d5f82e6dc10e303cadd5791dbb71b29.
Revert 444ca7d..65e2a34

This rolls back to commit 444ca7d13d5f82e6dc10e303cadd5791dbb71b29.
Revert 3198072..79d4722

This rolls back to commit 3198072e857b5fe81573572364f59d442cd0f728.
Roll back