tryin to fix my symlink merger confligct