Added TODO comment to test branching and merging