fixed conflicts
Merge branch 'OrfeasZ-master'