Revert "Test Conflit merge"

This reverts commit bec7247df51de7a191168e00df3f7b871fa23a29.