merge conflict in target controller and index solved