resolve blody git problem
Merge origin/master