Initialised git with gridpro2Foam source code
fixed merge conflict