remove targets files which are not needed or have conflicting names
re-add targets file with correct name
resolve merge conflict