committed the changes on both branches maybe?
Merge branch 'another_branch'