fixing pull right
Merge branch 'temp' into HEAD