Second commit gitdemo
Merge fix