gc - trying to add  references so project builds remotely
gc - merge conflict