Conflicts resolved in new Code Location