remove needed Conflicts
Merge branch 'master' of github.com:pardus-anka/2013