write test
fix bug
profit
removed merge file