Update Linker
Confilcts solved