Resolved conflict in Manifest