check merge error
Merge remote-tracking branch 'origin/master'
added in login again as caused a merging error