added feature 1
added feature 2
Merge branch 'feature-2'
Revert "Merge branch 'feature-2'"

This reverts commit 11d1fa190eef98b10c6b2972cd7cf2bda2c1bfdc, reversing
changes made to 75e29bd2010a498ba5da51c4f7dbe5633803c61a.
Merge branch 'feature-1'
Revert "Merge branch 'feature-1'"

This reverts commit ffdfc9511e81186ff5fbe6121d0faf53ab91dc40, reversing
changes made to 8558ee1a055fe351410ae3d91385dcd7afdea798.